Revision: baz--resolve--1.2--patch-9
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Mon Jan 31 01:55:50 EST 2005
Standard-date: 2005-01-31 06:55:50 GMT
Modified-files: baz/baz.c commands/apply-delta.c
    commands/cache-config.c commands/inventory.c
    commands/merge.c libarch/ancestry.c
    libarch/apply-changeset.c libarch/arch-cache.c
    libarch/archive-pfs.c libarch/archive.c
    libarch/archives.c libarch/conflict-handling.c
    libarch/inode-sig.c libarch/make-changeset.c
    libarch/merge-three-way.c libarch/merge.c libarch/my.c
    libarch/my.h libarch/patch-logs.c libarch/patch-logs.h
    libarch/pfs-dav.c libarch/pfs-fs.c libarch/pfs-ftp.c
    libarch/pfs-sftp.c libarch/pfs-signatures.c
    libarch/pfs.c libarch/pfs.h libarch/proj-tree-lint.c
    libarch/project-tree.c libarch/project-tree.h
    libawk/associative.c libawk/associative.h
    libawk/relassoc.c libawk/relational.c
    libawk/relational.h
New-patches: jblack@gnuarch.org--2004/baz--applydelta--1.2--base-0
    jblack@gnuarch.org--2004/baz--applydelta--1.2--patch-1
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-9
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-3
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-4
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-5
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-6
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-7
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-8
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-9
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-10
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-11
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-12
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-13
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-14
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-15
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-16
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-17
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-18
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-19
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-20
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-21
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-22
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-23
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-24
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-25
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-26
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-27
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-28
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-29
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-30
    thelove@canonical.com/bazaar--devo--1.2--patch-4
    thelove@canonical.com/bazaar--devo--1.2--patch-5
    thelove@canonical.com/bazaar--devo--1.2--patch-6
Summary: Star merged thelove to resolve conflicts
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--applydelta--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-5

 * jblack@gnuarch.org--2004/baz--applydelta--1.2--patch-1
   Fixing up apply-delta to work with three way

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-3
   show progress dots for merge as they occur

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-4
   probe directly for patches rather than scanning each call

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-5
   merge performance tuning round #1

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-6
   free options when finished using them in commands/merge.c

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-7
   fix mem leak in arch_tree_root

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-8
   do not leak memory when an archive has no location

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-9
   free directory listing memory and the default version file name when looking for trees

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-10
   free the default version file name when looking for trees - really

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-11
   free the default version file name when looking for trees - really really

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-12
   connecting to archives should not abuse arch_get_meta_info

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-13
   fix all arch_my_arch_params callees to not free, and change the function to memoise its result

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-14
   fix leak in arch_my_cache_path, and tune to use higher level api

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-15
   fix leak on archive connections by adding a pfs vtable call for disconnect.

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-16
   cache query parths should be freed

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-17
   free temp reltable in merge

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-18
   free cache query results after using them, and free the inode sig file name

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-19
   free more paths

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-20
   free temporary intersection

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-21
   cleanup archive_pfs leaks

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-22
   first round of extra frees from doing the merge logic

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-23
   provide a finalise mechanism for rel_cut_spec and use it. Also fix a early-free lean in apply_changeset

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-24
   nip another trivial leak

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-25
   more use of rel_cut_list leakage

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-26
   free serialisation rel_tables from make_changeset

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-27
   free option structure in inventory command

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-28
   use the standard set support for arch_ancestry_unique_to_branch

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-29
   assoc_set does not mutate either parameter - make both const

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-30
   memoise the arch cache path, and combine the machine with that for memoising my-id

 * thelove@canonical.com/bazaar--devo--1.2--patch-4
   many merge performance and memory adjustments

 * thelove@canonical.com/bazaar--devo--1.2--patch-5
   memoise the arch cache path, and combine the machine with that for memoising my-id

 * thelove@canonical.com/bazaar--devo--1.2--patch-6
   Fix up apply-delta -t

